This is gross. Olaf's change to the link line (which is actually correct)

broke the OS/X build becuase of link order.

Will someone please tell me again how great autoconf is?

CTVS: ----------------------------------------------------------------------

diff --git a/configure b/configure
index a544924b822f44bdb7c2b407b6095d95383ee182..5fa1ca7c5e91504526c29dfa87914b60a5fc992e 100755 (executable)
--- a/configure
+++ b/configure
@@ -2774,6 +2774,8 @@ fi
                *-*-darwin*)
                  if test "x$ac_cv_lib_usb_usb_interrupt_read" = "xyes" ; then
                        USB_LIBS="`libusb-config --prefix`/lib/libusb.a -framework  IOKit -framework CoreFoundation"
+                       LDFLAGS=$OLDFLAGS
+                       CDFLAGS=$OCDFLAGS
                  fi
                esac
                OSJEEPS=jeeps/gpslibusb.o
@@ -2831,6 +2833,12 @@ else
        *-*-darwin*)
                if test -f /sw/lib/libexpat.a ; then
                        EXPAT_LIB=/sw/lib/libexpat.a
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBEXPAT 1
+_ACEOF
+
+
                fi
                ;;
        *)

diff --git a/configure.in b/configure.in
index a92b2e52a80c824c6c116dddfef78c6655bb6d44..594a80593f6e5b20216b623011ca5f6b21213a6e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -116,6 +116,8 @@ case "$target" in
                *-*-darwin*)
                  if test "x$ac_cv_lib_usb_usb_interrupt_read" = "xyes" ; then
                        USB_LIBS="`libusb-config --prefix`/lib/libusb.a -framework  IOKit -framework CoreFoundation"
+                       LDFLAGS=$OLDFLAGS
+                       CDFLAGS=$OCDFLAGS
                  fi
                esac
                OSJEEPS=jeeps/gpslibusb.o
@@ -161,6 +163,8 @@ AC_ARG_WITH(libexpat,
        *-*-darwin*)
                if test -f /sw/lib/libexpat.a ; then
                        EXPAT_LIB=/sw/lib/libexpat.a
+                         AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat])
+                         AC_SUBST(EXPAT_LIB)
                fi
                ;;
        *)